Use the less efficient g_object_interface_find_property () instead of the

Mon Jul  5 23:47:38 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkfilechooserutils.c (delegate_notify): Use
	the less efficient g_object_interface_find_property () instead
	of the param_id range check, since the GParamSpecs we're
	dealing with are the overridden onces on the interface, whose
	param_id is always zero.  (#145312, Alex Roitman, fix proposed
	by Owen Taylor)

diff --git a/ChangeLog b/ChangeLog
index ec334577b6f887131406cb360bc4eeee1d270b1a..2e0b9a9edcbbbf18cec3c053fbb72a1777990a7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jul  5 23:47:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserutils.c (delegate_notify): Use
+       the less efficient g_object_interface_find_property () instead
+       of the param_id range check, since the GParamSpecs we're 
+       dealing with are the overridden onces on the interface, whose
+       param_id is always zero.  (#145312, Alex Roitman, fix proposed
+       by Owen Taylor)
+
 2004-07-05  Lorenzo Gil Sanchez  <lgs@sicem.biz>
 
        * gtk/gtklayout.c (gtk_layout_add): added a default method for the add

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ec334577b6f887131406cb360bc4eeee1d270b1a..2e0b9a9edcbbbf18cec3c053fbb72a1777990a7b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Mon Jul  5 23:47:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserutils.c (delegate_notify): Use
+       the less efficient g_object_interface_find_property () instead
+       of the param_id range check, since the GParamSpecs we're 
+       dealing with are the overridden onces on the interface, whose
+       param_id is always zero.  (#145312, Alex Roitman, fix proposed
+       by Owen Taylor)
+
 2004-07-05  Lorenzo Gil Sanchez  <lgs@sicem.biz>
 
        * gtk/gtklayout.c (gtk_layout_add): added a default method for the add

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ec334577b6f887131406cb360bc4eeee1d270b1a..2e0b9a9edcbbbf18cec3c053fbb72a1777990a7b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Mon Jul  5 23:47:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserutils.c (delegate_notify): Use
+       the less efficient g_object_interface_find_property () instead
+       of the param_id range check, since the GParamSpecs we're 
+       dealing with are the overridden onces on the interface, whose
+       param_id is always zero.  (#145312, Alex Roitman, fix proposed
+       by Owen Taylor)
+
 2004-07-05  Lorenzo Gil Sanchez  <lgs@sicem.biz>
 
        * gtk/gtklayout.c (gtk_layout_add): added a default method for the add

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ec334577b6f887131406cb360bc4eeee1d270b1a..2e0b9a9edcbbbf18cec3c053fbb72a1777990a7b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Mon Jul  5 23:47:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilechooserutils.c (delegate_notify): Use
+       the less efficient g_object_interface_find_property () instead
+       of the param_id range check, since the GParamSpecs we're 
+       dealing with are the overridden onces on the interface, whose
+       param_id is always zero.  (#145312, Alex Roitman, fix proposed
+       by Owen Taylor)
+
 2004-07-05  Lorenzo Gil Sanchez  <lgs@sicem.biz>
 
        * gtk/gtklayout.c (gtk_layout_add): added a default method for the add

diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index cd8e850db961521b0f4895241df31c5f11724968..2b41e36696eb6fa3ea93562f46fc197e023aefae 100644 (file)
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -145,8 +145,8 @@ _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface)
 
 /**
  * _gtk_file_chooser_set_delegate:
- * @receiver: a GOobject implementing #GtkFileChooser
- * @delegate: another GObject implementing #GtkFileChooser
+ * @receiver: a #GObject implementing #GtkFileChooser
+ * @delegate: another #GObject implementing #GtkFileChooser
  *
  * Establishes that calls on @receiver for #GtkFileChooser
  * methods should be delegated to @delegate, and that
@@ -162,7 +162,6 @@ _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
   g_return_if_fail (GTK_IS_FILE_CHOOSER (delegate));
 
   g_object_set_data (G_OBJECT (receiver), "gtk-file-chooser-delegate", delegate);
-
   g_signal_connect (delegate, "notify",
                    G_CALLBACK (delegate_notify), receiver);
   g_signal_connect (delegate, "current-folder-changed",
@@ -294,11 +293,12 @@ delegate_notify (GObject    *object,
                 GParamSpec *pspec,
                 gpointer    data)
 {
-  if (pspec->param_id >= GTK_FILE_CHOOSER_PROP_FIRST &&
-      pspec->param_id <= GTK_FILE_CHOOSER_PROP_LAST)
-    {
-      g_object_notify (data, pspec->name);
-    }
+  gpointer iface;
+
+  iface = g_type_interface_peek (g_type_class_peek (G_OBJECT_TYPE (object)),
+                                gtk_file_chooser_get_type ());
+  if (g_object_interface_find_property (iface, pspec->name))
+    g_object_notify (data, pspec->name);
 }
 
 static void